266e2e8ae2722c6a3a7935a5324b8fde7983dea0,src/com/redhat/ceylon/compiler/java/loader/CeylonEnter.java,JavacAssertionVisitor,getIdentifyingNode,#Node#,573

Before Change


                        .getIdentifier();
            }
            else if (node instanceof Tree.SimpleType) {
                return ((Tree.SimpleType) node).getIdentifier();
            }
            else if (node instanceof Tree.ImportMemberOrType) {
                return ((Tree.ImportMemberOrType) node).getIdentifier();
            }
            else {    
                return node;

After Change


                super.checkType(that, type, typedNode);
        }
        
        protected Node getIdentifyingNode(Node node) {
            Node result = null;
            if (node instanceof Tree.Declaration) {
                result = ((Tree.Declaration) node).getIdentifier();
            }
            else if (node instanceof Tree.ModuleDescriptor) {
                result = ((Tree.ModuleDescriptor) node).getImportPath();
            }
            else if (node instanceof Tree.PackageDescriptor) {
                result = ((Tree.PackageDescriptor) node).getImportPath();
            }
            else if (node instanceof Tree.NamedArgument) {
                result = ((Tree.NamedArgument) node).getIdentifier();
            }
            else if (node instanceof Tree.StaticMemberOrTypeExpression) {
                result = ((Tree.StaticMemberOrTypeExpression) node).getIdentifier();
            }
            else if (node instanceof Tree.ExtendedTypeExpression) {
                //TODO: whoah! this is really ugly!
                result = ((Tree.SimpleType) ((Tree.ExtendedTypeExpression) node).getChildren().get(0))
                        .getIdentifier();
            }
            else if (node instanceof Tree.SimpleType) {
                result = ((Tree.SimpleType) node).getIdentifier();
            }
            else if (node instanceof Tree.ImportMemberOrType) {
                result = ((Tree.ImportMemberOrType) node).getIdentifier();
            }
            else {
                result = node;
            }
            if (result == null) {
                result = node;
            }
            return result;